diff options
| author | Adam Soltys <[email protected]> | 2022-11-22 12:09:44 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-11-22 12:09:44 -0800 |
| commit | aaa66ea658f7c5b8fac8ce4b3c02bd94bafdff8e (patch) | |
| tree | e827d58cd12821b6e9d0827c4839da73df19f8e5 /src/routes/(app)/[username]/request/[id] | |
| parent | 5f020f8d77e8fac1b95e392d0d4a147354b25d07 (diff) | |
| download | coinos-ui-aaa66ea658f7c5b8fac8ce4b3c02bd94bafdff8e.tar.gz coinos-ui-aaa66ea658f7c5b8fac8ce4b3c02bd94bafdff8e.zip | |
clean up request flow, update translations and deps
Diffstat (limited to 'src/routes/(app)/[username]/request/[id]')
| -rw-r--r-- | src/routes/(app)/[username]/request/[id]/+page.server.js | 9 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/request/[id]/+page.svelte | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js index 8245bef6..7beabfe6 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.server.js +++ b/src/routes/(app)/[username]/request/[id]/+page.server.js @@ -10,10 +10,13 @@ export let load = async ({ cookies, depends, locals: { user }, params }) => { if (invoice) { let { amount, received, uuid } = invoice; - if ((received && !amount) || received >= amount) throw redirect(307, `/send/${uuid}`); + if ( + request.recipient.username === user.username && + ((received && !amount) || received >= amount) + ) + throw redirect(307, `/invoice/${uuid}/paid`); - if (request.requester.username === user.username) - throw redirect(307, `/send/${request.invoice.uuid}`); + if (request.requester.username === user.username) throw redirect(307, `/send/${uuid}`); } return { request }; diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte index 0f979284..7dd10e09 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.svelte +++ b/src/routes/(app)/[username]/request/[id]/+page.svelte @@ -1,4 +1,5 @@ <script> + import { t } from '$lib/translations'; import { Avatar } from '$comp'; import { f, sat, sats } from '$lib/utils'; import { request as req, requestRedirect } from '$lib/store'; @@ -20,7 +21,7 @@ <div class="text-center mb-8 space-y-5"> {#if request.recipient_id === user.id} <p class="text-5xl break-words"> - <span class="text-xl md:text-2xl">Sent invoice to</span> + <span class="text-xl md:text-2xl">{$t('transactions.sentInvoiceTo')}</span> </p> <div class="flex p-1 gap-2 justify-center"> <Avatar user={request.requester} size={20} /> @@ -34,7 +35,7 @@ </div> {:else} <p class="text-5xl break-words"> - <span class="text-xl md:text-2xl">Sent request to</span> + <span class="text-xl md:text-2xl">{$t('transactions.sentRequestTo')}</span> </p> <div class="flex p-1 gap-2 justify-center"> <Avatar user={request.recipient} size={20} /> |
